Comply with the latest XText version