Merge "Fix overflow check so it doesn't reject legitimate files"