Fix for #917