Further flag sanitization
try to remove nan handling v1