issue #49, and some more on issue #15