Fix bug 1052153