Fix for #451