Fixing errors on controllers, to support the new hidden controllers
feature.