Controller is now correct