edit 0.6 fix1