Fix bug #17982