Fix patch to new style