fixup! fixup! Move logic from controller to decorator.