Issue 646