Fixing bug with dropDownList

See Comments in code for full description