fixes #107
fixes #108