Fixed r22124: