Issue 1241