Fixing your current and previous address order