Editing them before uploading is the only way in my experience.
Did you get a fix for this problem as I am having the same issue? Thanks
More