Fixing weird Entity conflict