Dev fix entity