edit 0.8 fix 2