fix #39 & rebuild