bugfix issue 18