fix #59, tagging ready