Closes #670

#670