Loading State bug fixed