HAL-388 / BZ1082606: Followup fix