Work on issue #246