Fixed swap controller.
Merge pull request #9 from george2/hotfix-01

Fixed swap controller.