fix mismatched blocks