Fix issue 789