fix for timestamps