Fix: controller is thread safe