The issue #1 has been fixed