GRECLIPSE-1686 Minor fix