#169 bugfix