Enitties fix