Fix for #938