Fixed inconsistency
Merge pull request #1062
Merge pull request #1062 in master