Merge pull request #1404 from nabinhait/hotfix

Hotfix