I can make a PR for the iOS case if it is what needs fixing, but would be interesing to confirm