Fixed EPR#400081