fix some low performance