added timeout which was removed a few commits before