Fix the inconsistency issue