Forgot to change the 'hack' to avoid all screens...