Fix for compound association edge case