Resolution of the issue #5