Issue 679