fixes #185; fixes #173