Fix routing again