ALM-213 fixed association in decorator