Note support for 1.9+