fix bug
fix display bug
finish fix bug