Fix first part of bug #18982. Thanks to John Darrington for finding