fix entity inconsistency