"Fixing" the timeout