OutputManager patch