Trying to fix Mac upload encoding issues