clean up
fix #22