We need to fix the flag again