[#21] Fix controller bug (on local machine)

* May not work on server!!
Merge branch 'task-21-fix_controller_bug' into develop
Merge branch 'develop'