fix 3.18 and 3.45