MCManager fix