Change related to flag processing