fix 3.9,resolve 2.4 conflict