[FIX] Critical bug in Cotroller class