Fix for some errors with tags.