applied short term fix

for issue with associate entity