Fixes to close issue #17