Dropdown fix 2.0