Fixup! data types in response are optional now