Fix timestamp condition in other places.