fix #1 issue