Work on issue #207