Fixed inconsistency issues