Fix for #844