Fixed end timestamp not being persisted.