Fix for GitHub issue 3469 - part 2