maybe I fixed issue #22 now