Make it work in 1.9.3 and 2.0.0