fix for timestamp