Fixing the import problem