Closes #722