fixes #18; fixes #17;