Fix/1761

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