Fixed routing / args bug