Fixed invalid entities