Work on issue #175