Fixes #902
Closes OCT-5