Fixes #5216
Merge pull request #5218 from GrahamCampbell/4.2-confirm2

[4.2] Fixes #5216 [OPTION 2]