Enabled auto-enable feature again
Fixed switching controller functionality