Fix for PE-1554.