Issue 760
