hopefully fixed time out bug