Fix for #962
Unwanted changed