#27 bugfix