Issue 766
