Rework on issue #16