#18 bugfix