completed - task : fix all association bugs