Fix/968

Closes #968