Fix routing issue