fixed resolve bug
fixed resolve bug