*fixed regressions introduced with earlier Mathieu's commit