fix hang on MC bug