adding the fix for the issue #1