Fixed bug where status doesnt reflect in the UI