compatibility for Fork 3.5