Trying to fix associated objects leak