The issue #2 fixed