Fixing bug where calling stop does nothing