Issue 6.4/7.1