Fix usage of right time stamps