Fix/1865

closes #1865 

- [ ] Ready to merge