Corrected manager handling