Fix to location field. Not done yet.