[TASK] Fixed missing demand in controller - Closes #31