Fix for controller
Merge pull request #1 from empoalp/master

Fix for controller