Closes #861

#861