--- a/script/utils/search_topsy.py	Fri Jul 04 16:19:28 2014 +0200
+++ b/script/utils/search_topsy.py	Fri Sep 12 13:03:29 2014 +0200
@@ -154,10 +154,16 @@
             session.flush()
             session.commit()
 
-            time_to_sleep = int(math.ceil((tweet.rate_limit_reset - time.mktime(time.gmtime())) / tweet.rate_limit_remaining))
-            
             print("rate limit remaining %s of %s" % (str(tweet.rate_limit_remaining), str(tweet.headers.getheader('X-Rate-Limit-Limit'))) + term.clear_eol())
             move_up += 1
+            rate_limit_limit = int(tweet.headers.getheader('X-Rate-Limit-Limit'))
+            rate_limit_remaining = int(tweet.rate_limit_remaining)
+
+            if rate_limit_remaining < rate_limit_limit:
+                time_to_sleep = 0
+            else:
+                time_to_sleep = int(math.ceil((tweet.rate_limit_reset - time.mktime(time.gmtime())) / tweet.rate_limit_remaining)) 
+
             for i in xrange(time_to_sleep):
                 if i:
                     print(2*term.move_up())