final fix for tag (hopefully