Fix ridiculous race condiiton with loading indicator