         if (labelChanged)
         {
             labelChanged = false;
-            updateLabelElement();
+            updateLabelDisplay();
         }
     }
     

    override protected function commitSelection(dispatchChangedEvents:Boolean = true):Boolean
    {
        var retVal:Boolean = super.commitSelection(dispatchChangedEvents);
        updateLabelElement();
        return retVal; 
    }
    

     *  Called whenever we need to update the text passed to the labelDisplay skin part
     */
    // TODO (jszeto): Make this protected and make the name more generic (passing data to skin) 
    mx_internal function updateLabelDisplay():void
    {
        if (labelDisplay)
        {
            if (selectedItem != null && selectedItem != undefined)
                labelDisplay.text = LabelUtil.itemToLabel(selectedItem, labelField, labelFunction);
            else
                labelDisplay.text = prompt;
