Another fix for tag stripping