Fixes #106. Turns out a controller bug was also uncovered and fixed.
Merge pull request #110 from HSWebteam/fix_106

Fixes #106