Fix for #931
Fix for #931