Using new hook in 3.7, #498