Issue 822 additional