latest fix to make sure import works