fixed a timestamp bug due to merge yesterday