Improve 1.9 compatibility