Issue 969
