Fix for timeout issue #10