bugfix to timeouts