timeout possibly not handled properly

Related issue: #288