Fixed the associations issue