DropDown Bug fix