Fix for #974
Fix for #974
Fix for #952