Another attempt to make issue_566 pass unittests