added fix for flagging