#21
fixes #107