edit 0.8 fix2