Fix for registry validation