0.9 fix