fix time stuff for real