Adding minor fix for timeouts