Issue 25.1

Issue 24.6