fix #26 issue