Fix for PE-1404.