Fix organize-tags error [finishes #82221268]