Finally fix flags