fixup! Ensure that Reflectors are the first field