solve latest bug