edit 0.9 fix 1