restore 1.8 support