Hotfix for display