Iron golem stuck in blocks when spawned.

I've seen multiple reports about this problem already and it says that they have been resolved, however, the iron golems in my iron farm still get stuck in blocks when spawned. The farm was working perfectly in 1.15.2. The bug started to pop up in 1.16.2 and was still happening in 1.16.3. This bug really affects the rate of my iron farm. The iron farm is an original 1.15.2 design from Wattles: https://www.youtube.com/watch?v=RLrqQY6SfZA