Fix for the issue #2