made import more robust.