Issue 6.5