fix 2.5 issues