Attempt to fix command manager