Bugfix. Start/Stop were issuing restart