fixes #105
fixes #106