Another attempt to fix the import location