Fixed EPR#388613