Hotfix for dropdown issues