fix some problew