Merge pull request #2558 from nabinhait/fix1

message changed