CB-7549 - Re-fix