FIXED: Race condition with fast internet connections