Fix for #959