fixes #155; fixes #188