Band-aid for timeout in issue #950

Band-aid for #950