Fix EntityHandle that was not working at all :)