Fix for tag verification