fixup! AZ support for cells