[FIX] fixed/improved initial import handling