Added workaround for XML mind