Update for GE2/1 + bug fix