Fixed regression by bug 767313