Fix "reset date on pageback" bug