Timeout bugfix (hopefully)