fixed associatiosn
Merge branch 'master' into dev  - should have been a hotfix