Ensure timeout works correctly #1032