Fix issues with routing (crash application)