Fix annoying timestamp overlap