support 1.6.20