fix for tagging