fix #22 bug