GRECLIPSE-1565 - potential fix