Bug fix -- control-panel