Fixes FromStr moving locations