Fix/1865

closes #1865 

- [x] Ready to merge