fix #17, fix #16