Hopeful 0.9.0 fix