clean and fix #19