Fix for empty label2 (regression from core)