Fix for #934