Fixed some bug on main-feature