issue #7 rework