finally fixed timestamps