Water stunts and non swimmer contestants

After watching the last two episodes I felt bad for Mahi both her stunts were water based and that two very difficult ones with underwater swimming. How can she even attempt to do the stunt when she can't even swim? I remember once during the teams in the game changer stunt they had to go underwater and get a dummy out and in Jay's team Yuvraaj had not done any previous task but because he couldn't swim Arjun said he can't do the task and the opposing team need to pick someone in place of him. So I don't understand why now they are giving non swimmers underwater stunts.
I know Tina did one even though she couldn't swim but her task was a little bit easier as she could hold onto the sides of the cage to manoeuvre herself. But Mahi couldn't even do that on any task she was given this week, say she did manage to climb onto the wheel helped by the divers but I don't think she would have been able to get a flag after seeing Vivan and Raghav who are relatively taller having to jump so much to get them!

I just thought it was a bit unfair to Mahi in that task.

Maybe it was bit unfair, but how long she can run away from water tasks.. At one stage or other she has to face it. Being non-swimmer can not be an excuse. Yuvraj got benefited at that time because of the team concept. Had he been in the show at this stage, even he would have faced the same problem. Even for Tina, she had been doing mostly keeda stunts. But there was time when she had to do water stunts, there was no way out there.

I think they should only choose contestants who know how to swim. How can you even enroll someone in a stunt show who can't swim, lots of stunts are water based. If anything it's the channels fault for even bringing Mahi on board