Last bit of fix for timestamp issues