Fixing for newer Ubuntus