Concerning #827

All unittests pass #827