fix problem with tagging mechanism