fixed association errors
Merge pull request #22 from Cynaria/fixing_association_error

fixed association errors