fix order of timestamps used ...