Merge pull request #2200 from nabinhait/hotfix

Minor fix