fixing controller manager bugs