Fix for wrong t_current with old snapshots