bugfix #40