Fixed usage of location_id