Also fixed in soc2013/composite-fields.