refixed routing issue