MB-35 #comment fixing the uuid dep