Fix entities assoc