Fixed EPR#399411