fixed location field again