bugfix on XML structure