add check for timestamp correctness