PIM-3368: Fix association transformer