fix #15, #12