Fixing timeouts