Hotfix for dashboard