Fix routing AGAIN