Might fixed Entity is already tracked errors