Routes handling fix.