fix #10 & rebuild