Fix routing problem