Fix Reflector for new system