fix entity mark and