entity_handle fix