Work on issue #68