bugfix: issue #17