Changed a bit the KeyboardManager behaviour