Get this tested in 3.6.2