Another fix to avoid installation errors