fix with timestamps