trying fix entities