edit 0.4 fix 1