fixed issue with timestamps