timestamp bug fixed