Fix UI loading logic one more time ...