Issue 24.4