Hotfix solution for the new button.