Modified timestamp bug