fix #7 issue