Import: Fixed bug preventing import in some situtations