add 0.8 support back