#13 bugfix