Make patch 16 idempotent