revert before merging ged-fix
merge with ged-fix