Fix works in 1.6 and 1.7