bugfix issue #20