#57 bugfix