Further work on issue #66