hopefully fix 0.8 support