Fix #214 breaks existing association resolution