Guardians float after interacting with flowing water

So, for a while now, when I have guardians flow down a water stream, they float in the air once they get to the end and fall off. And it makes Guardian Farms a real pain to make.