Bug Fix: setting done not reflective of the current status