added a timestamp fix