fixes #178
fixes #186
fixes #187