fix some bugies 3