Fixed inconsistency with master