Fixes #128 

A change I made to controllers is causing a problem with controllers. I've reverted the change and this fixes #128.