Flags fixed