Fixup cController even better