Fixed (maybe) timestamp issue XD