Fix initial import