Fixing the issue #2