#116 bugfix