Fix for tags.