Fixed routing issue