now working on 3.9.8 (4.0.0-rc0 most likely)