fixes #24; fixes #22