Get this tested in 3.6.2
And turn on strict variables so that we know we work with that