#44 bugfix