gave the associative entity an active field
Merge branch 'exp'