Fix routing with needles