Add Issue 6.8