Fixing associations issue