Fix for new Ubuntu versions