fixes #100
fixes #111