U: fix #12 & rebuild