Fix flag conflict