I think I fixed issue #1