fixed tagging working