Issue 6.7