Fixing AWE v2.6