P: additional fix