fix #7, #8