Pull in possible fix to our flag issue :)