Fix for #687