GRECLIPSE-1773 Possible fix