Load bug fix