Fixed major error in control-daemon