Second fix for Arch patch.