GRECLIPSE-1801 fix