Fix/1012

Closes #1012