U: fix #12 & #15