Added James Peach's fix for #1038.