Band-aid for timeout in issue #950

Band-aid for #950 (see couple questions I am asking)