Fix for #694