diff --git a/lib/fog/model.rb b/lib/fog/model.rb
index bcae38065..fab2e6246 100644
--- a/lib/fog/model.rb
+++ b/lib/fog/model.rb
@@ -111,13 +111,10 @@ module Fog
 
     def wait_for(timeout = 600, &block)
       start = Time.now
-      until instance_eval(&block)
-        if Time.now - start > timeout
-          break
-        end
+      begin
         reload
         sleep(1)
-      end
+      end until instance_eval(&block) || Time.now - start > timeout
     end
 
     private