Improve fix for Arch linux and other dist