0.5.5 fix bugs cont.