Minor fix
Merge pull request #2199 from nabinhait/hotfix

Minor fix
Minor fix
Merge pull request #2200 from nabinhait/hotfix

Minor fix
conflict resolveed