Towards #28 again ...