make it works on 3.10.2.1