Fix issue with MegatonCommandManager