Swim update 1.13 - Animation gets stuck

Minecraft 1.13 has added a new swimming mechanism. If you now swim downwards, sprinting, so you swim faster, and after doing and holding that, press SHIFT, to get down even quicker, you get stuck in the swimming animation model when you hit the ground. That means that you are just a few inches above the ground which is really annoying because you need to get a block free under you to get back into a normal position.