removed uuid hack