fixed entity associations