fixes #110
fixes #109