Profession-less villagers gain profession before unemployed profession villagers do

So I moved a village to an Island with my house on it and made houses and profession buildings for the villagers and ended up moving the profession blocks a couple times. In the process of doing that, I traded a couple times with a couple villagers, so those villagers keep their profession. When I placed down the profession blocks again, sometimes other villagers would take over instead of the one of that kind taking over. So now I have multiple villagers with professions, without profession blocks. So, now they won't ever replenish their inventory. I've tried multiple times to destroy and place the blocks to reset who gets it, but so far it hasn't been the villager already with the profession.

So it would be nice if instead of it possibly being random, that it checks if a villager nearby has the profession of that block and does not currently have a profession block of its own, before randomly giving it to an unemployed, profession-less villager.

[EDIT} Workaround:
1. Remove offending profession blocks.
2. Get a large amount of profession blocks (e.g. Barrels as they have other uses).
3. Place them so every profession-less villager selects them.
4. Re-place original profession block to get original villager to select it.
5. Remove excess profession blocks.