Add timestamp checking fixes #1