Merge pull request #2604 from nabinhait/fix1

Fixes