edit 0.3 fix1