Fix timestamp selection