INT-17 Minor fix