Fixed EPR#400104