Merge pull request #3247 from jplitza/fix-2843