Hopefully fix 0.9