Manager fix