Made Arch detection even more precise