Greclipse 1700

The bug is fixed, test were checked, everything seems to work fine.