fixed issue #25