fixes #1385; fixes #1386