Fix for PE-1406.