first bucket fix for custom timestamp