#39 bugfix