Fix bug 19153