Fixed: controller bug