route handling fix