GRECLIPSE-1773 Fix and test