Rob: improve timestamp check