Bug fixed on Entity enum