Re-write frame matching with strict mode.