better usage of typed navigation of DS (thks os890 ;)