Dogs stuck underwater

Dogs will walk into water by themselves, get stuck, and then not get themselves back out because they are under a block and their ai does not make them get out. Please fix this urgently, I have lost too many dogs to this