Fix for #964