fixed for another race condition with loading data