Fix for PE-1540.