AC: additional fix