Changed how labels are handled.