Issue 954
