ugly fix for timestamps
ugly fix for timestamps