Issue 1244 take two