Actually fixing flags