Actually fix UID propagation