Merge pull request #2199 from nabinhait/hotfix

Minor fix