fix 1.2.2 and above