Correct timestamp behavior