Loading bug fix