First fix for Arch patch.