Fix eval controllers
0.0.9-6