2 bug fixes: attribute system time correctly and handle race