Fork 3.5.0 required