Also support 3.10.1 and further