Fix Lost Flag Bug