Fixed associations - closes #48