Fix for #833