Merge pull request #2591 from nabinhait/fix1

Fixes