Possible fix for CoreRegistry proxy not getting set right