Finally really fixed the issue of dealing with __uc__ fields universally and well