Fix : Use time_hacker where needed