bug with server time fixed