fixed issue #60