And fix warning