Fixed loadingAfter firing too much