Fix Flagging security flaw