Closes #868

#868