major onTimeout bugfix