Pick up xstream fix