Fix range controller swap