Fix annoying timestamp overlap
Merge pull request #189 from jorygraham/patch-6

Fix annoying timestamp overlap