Submerged Witch Huts

After searching many worlds for Witch Hutd after the new release I found several but all of the huts are submerged to the roof. Once emptied of water they seem spawn all regular mobs inside, not witches.

I attempted to build up the floor of the huts to above water (removing the roof) one block level at a time to see if that would help but they still spawn everything but witches it seems.