fix routing - sortof