Use a better timestamp