Small fix related to timestamps