attempted fix on issue #99