fix around timestamps