bugfix
Handle timeout #10