Hotfix on master to make the screen read better