Merge pull request #1341 from nabinhait/hotfix

Small fix