Issue 789
