Added timeout for Amazon to catchup