Closes #672

#672