Work on issue #284