Fork 3.34 part 2