Merge "Fix a bug that did not check the status after it is assigned"