Issue 2645