Added additional timeout #74