Closes #719

#719