#166 bugfix