Issue 24.6