LPS-40748 use the taglib properly