This change Fixes #1 issue