New 2.9.7 bugs