updates concerning issue #17