Merge pull request #2616 from nabinhait/fix1

Fix1