fixed controller swaparoo