Fixed Loading Bug