update for ver >= 2.6