Fix for #803