should fix routing code