add 3.8.x support