fix a lot bug