Fix flag even more