update 6.x for some mistakes