Attempting a fix for xstream