Progress on issue #82