Fix for #1013
Fix for #1014
Fix for #962
Unwanted changed