fixed issue #59