#212 bugfix