Fix reloads causing errors