Issue 1198