Applied fix2