Trying to fix issues with the controller