fix withuuid