How I fixed issue #23.