Villagers over breeding by two over existing number of beds.

Since the update my villages have gone all wrong. One now has 5 librarians although there are only 4 lecterns. I have 4 fisherman but only 3 barrels. And they breed until there are 2 over the number of available beds. All beds are accessible in one story houses. I have removed all wheat in hopes that they will not breed more when I get around to adding another house with 2 beds in it so that all current villagers have a bed.