Closes #623

#623