Fix in manager