clean up
fix #389