Fixed currentScreen initialisation