Fix #198 rework of the fix