switch to UUID & bugfix