Fixes partner blocks
Merged