Fixed inconsistency
Merge pull request #1062