add timestamp - while fixing this bug