Swimming bug

When you are riding a horse and you dive into the water automatically you get off the horse
Well, when you are in the water and try to swim the jump button isn't updated to swim mode, and that is annoying