#155 bugfix