Fix Patchwork interception