Fixed EPR#391728