Fixed EPR#400293