Fix bug 13655