Fixed EPR#392210