fixed entity assignment