Fixed Loading Issue