fixes #241
fixes #242