FIX: validation in controller.c