timeout bugfix