Greclipse 1777 fix and test