Loading Hang Fix