Closes #726