a little bit Flag repairing