fix #8, #9