rm issue state fix #24