Issue 738