fix address and time helper