Fixes #106

Fixes #106. Turns out a controller bug was also uncovered and fixed.