Remove timestamp bug