Added the missing location field back.