fixed issue #74