timestamp margin fix