When the guy is out of breath tap him and he will go out of the water. If you don’t get him out of the water in time he will go up by himself.
Also he will get out of the air above the water if you click before he's out of air, I KNOW! Sadly, I can’t fix that though.
