Fix loading indicator showing problem #22