fixes #1358, fixes #1359

[affeldt-aist]

Motivation for this change

fixes #1358

fixes #1359

Checklist

• [x] added corresponding entries in CHANGELOG_UNRELEASED.md

~~- [ ] added corresponding documentation in the headers~~

Reference: How to document

Reminder to reviewers

• Read this Checklist
• Put a milestone if possible
• Check labels