does xml2po work correctly now?