fixes #1278; fixes #1279