fix 3.45 and 3.48