catch up with v1.65 tip