Issue 907
