Issue 946