fixes #69; fixes #67