bug fix & ue improve