Attempted fix for timeout bug (#1).