added 3.9.0 support