fixes #1062; fixes #1283