BLK-226 fix patching. Unrelated error was actually related