resolve bug