Fixed not unloading old data