Concerning #827

All unittests pass