Fix wrapping issue with tags