Fix/1761

This closes #1761

- [ ] ready to merge

@rem do you wanna check this out and test?