Fixup the frame parsing