Controllers fix