Fixed issue with loading indicator