FIXED: Race condition with fast internet connections
Merge pull request #675 from Viper-7/master

FIXED: Race condition with fast internet connections