Fix the main controller to moments controller