BLK-226 fix patching