Fixed problems with the import