Labels are now properly linked