edit 0.9 fix6