fixed resolve bug