Bug/xml check after pr160