Better GDoc compatibility