Fix evaluation controller, thanks to our tests