Fix for #735