Fixed null values in area holder