Rework on issue #284