fixed registration and uuid