Fix location (de)serializing