#129 bugfix