Fix controller duplication.
Merge pull request #307 from gsn/master

Fix controller duplication.