Fixed flag not dropping (for real this time)