GRECLIPSE-1776 Fix and test