Fix for #950