#15 bugfix