fix #4, fix #6