bug with time fixed