added resolve bug