Work on issue #271