Finally fix the Mac import issue