Updated to deal with Fedora