resolves #107; fixes #108